Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add __slots__ to timer helpers #9406

Merged
merged 6 commits into from
Oct 3, 2024
Merged

Add __slots__ to timer helpers #9406

merged 6 commits into from
Oct 3, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 3, 2024

What do these changes do?

We use __slots__ almost everywhere else in the codebase, however __slots__ was missing for these helpers

related issue #4618 (comment)

Are there changes in behavior for the user?

no

Is it a substantial burden for the maintainers to support this?

no

We use __slots__ almost everywhere else in the codebase, however
__slots__ was missing for these helpers

related issue #4618
@bdraco
Copy link
Member Author

bdraco commented Oct 3, 2024

python/cpython#106771

Copy link

codecov bot commented Oct 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.57%. Comparing base (3f43bd1) to head (986129b).
Report is 3 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9406   +/-   ##
=======================================
  Coverage   98.57%   98.57%           
=======================================
  Files         107      107           
  Lines       35037    35041    +4     
  Branches     4150     4150           
=======================================
+ Hits        34536    34540    +4     
  Misses        334      334           
  Partials      167      167           
Flag Coverage Δ
CI-GHA 98.45% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.11% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.53% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.80% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.67% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.60% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.67% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.75% <100.00%> (+<0.01%) ⬆️
Py-3.12.6 98.16% <100.00%> (+<0.01%) ⬆️
Py-3.13.0-rc.3 98.15% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.56% <100.00%> (-0.01%) ⬇️
Py-3.9.20 97.50% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.12% <100.00%> (+<0.01%) ⬆️
VM-macos 97.80% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.11% <100.00%> (+<0.01%) ⬆️
VM-windows 96.53% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bdraco bdraco added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Oct 3, 2024
pyproject.toml Show resolved Hide resolved
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 3, 2024
pyproject.toml Outdated Show resolved Hide resolved
@bdraco bdraco marked this pull request as ready for review October 3, 2024 20:02
pyproject.toml Outdated Show resolved Hide resolved
Co-authored-by: Sam Bull <[email protected]>
@bdraco bdraco merged commit 24b0e6f into master Oct 3, 2024
38 of 39 checks passed
@bdraco bdraco deleted the timer_context_slots branch October 3, 2024 21:54
Copy link
Contributor

patchback bot commented Oct 3, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 24b0e6f on top of patchback/backports/3.10/24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9/pr-9406

Backporting merged PR #9406 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9/pr-9406 upstream/3.10
  4. Now, cherry-pick PR Add __slots__ to timer helpers #9406 contents into that branch:
    $ git cherry-pick -x 24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9
    If it'll yell at you with something like fatal: Commit 24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add __slots__ to timer helpers #9406 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9/pr-9406
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Oct 3, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 24b0e6f on top of patchback/backports/3.11/24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9/pr-9406

Backporting merged PR #9406 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9/pr-9406 upstream/3.11
  4. Now, cherry-pick PR Add __slots__ to timer helpers #9406 contents into that branch:
    $ git cherry-pick -x 24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9
    If it'll yell at you with something like fatal: Commit 24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add __slots__ to timer helpers #9406 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/24b0e6f7c9d5a0815aebdc0dde5ff9a860a550d9/pr-9406
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

bdraco added a commit that referenced this pull request Oct 3, 2024
Co-authored-by: Sam Bull <[email protected]>
(cherry picked from commit 24b0e6f)
bdraco added a commit that referenced this pull request Oct 3, 2024
Co-authored-by: Sam Bull <[email protected]>
(cherry picked from commit 24b0e6f)
bdraco added a commit that referenced this pull request Oct 3, 2024
bdraco added a commit that referenced this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants